Remove unecessary code

Reverted to version 1.0.0