Add deploy task, cleanup some things