remove unneeded components
major clean up
api doc