Comment out dev stuff for now