Fixes #49 + Deleting unused files