Removed class limits reference
Changed some duplicate ids
Fixed merging typos
Removed Surface dependency