Cleaned things up for deployment