Non-working code before removal of unused files