Removed old stuff in order to start over