Cleaned some code from Quad / Camera