Cleaned up some code injected by CTools