Remove copied code
Fix some stuff
Bump version to 0.0.1