Adding proper caps
Removing debugging info and save callbacks, not really needed