Remove unused code and moved around rocket code