Initial Session3 - remove unused components