Committing latest changes before code cleanup