delete some redundant code and clean up base