Major cleanup of fabfile