Cleared some stuff. Closes #45