Deleted debug output and updated some TODOs
These definitions are now in package extensions