Squiggles contoller cleanup