fix for resources and removing some unnecessary methods