Removed unused statements
Removed now obsolete components and refactored demo apps to use new manager