Cleaned up master .... again