removing deprecated function and unused classes #52