Cleanup
Remove unused methods
Massive fixes and refactors for Prism and Insight