Removed no longer used code in development