[Re-engineer project] Removing old code