Cleanup

More cleanup & deprecation
Cleanup

Some cleanup done while working on a project using Prank.