Removed unnecessary functions. Fixes #5.