library cleanup
clean-up and implemented Master's Call