Removing previous hacks. Start fresh.