Speed up manipulation creation/updating, hopefully lower the number of queries
Remove nonfunctional, commented code