cleaned up method removal