Cleaning

Fixed naming conventions, removed unused library natives, blah