Cleaned up the front for deployment