Clean up

Removed some redundant code and disabled antialiasing