Removed fixes (moved to boilerplate)