Cleaned Up Code

Removed Deprecated Functions, Planned Features (Will work on in a new branch), and added/removed comments.