Removed some old commented out stage-definitions