Cleaned up some code, removed frivolous/pointless methods