Removed unused stuff, still getting used to this