Remove debug statements and add mount