Cleaned up for deployment