Cleaning up code and unessicary components