Getting rid of stuff that's not needed.
Added unit tests, added delete and renamed methods to reduce naming conflicts.