Removed a bunch of no longer used code