10.9

Removed some redundant stuff, some cleanup.