Feature/redundant code

We should remove the bits that are not used so that the project is easier to understand for new team members.