remove unneccessary code
add a property that mount points