Finished cleaning up old code