Refactoring

Removes unnecessary code.