Removed some sludge / bad code that needs replaced