updates

removed unnecessary API
updates from Sam