Fixed bug in binary prefixes
Small fixes and removed unused functions