Revert "Updated to Installer method"

This reverts commit 10fd2a72b9e822537801ef0bbf4ff34ed27c15b4.
Revert "Quick Fixes"

This reverts commit 53c882421be3297525a322a1c0c6a67d0dc51e97.