Removed hacks
Fixed merge conflict