Revert "Develpment updates"

This reverts commit 49226c89d21ea4549c6bfe1b61bf793ff1f5a557.