Tidy up, trying to get deployment working properly