Clean up extra code

Smaller size when compiled