Cleaning up remnants from previous design