Chore/deleting and cleanup

This merge is a rather large cleanup as the project is wrapping up for the current development team. Multiple unused files and components are deleted and unnecessary comments and lines are removed.