Removing mock (these will still reside in redmine)