Skytop cleanup to move forward