removed some uncessesary methods