Removed development specific code

This code will remain in the development branch