Minor optimizations
Remove unused class
Remove debugging info