Some code cleanup. Deleted code that won't be needed and commented out functions that need to be reimplemented.