Few minor fixes and unused pieces removed