Code cleanup

Removed unnecessary code; updated to version 0.2