More work done, cutting some crap out