Beta Code Needs Cleaning Up