cleanup code :: remove redundant code, files
cleanup code :: remove redundant code, files