Version 11

Clean up - Part 1