Removed lots of old code... updates