WIP - Removing the obsolete code