Cleaned up some code, removed unused dependencies

Going to be adding more dependencies and reworking most of the code
soon in order to remove AP in favor of Subler for better performance
and easier scripting capabilities