* remove redundant code * fix tests * move declarations and defines where they belong
Attach a file by drag & drop or click to upload
