Time to get serious, cleaned up some mess.