More cuts, cleaned up the end