Minor Optimizations, Removed Old Libraries