removed unused method and cleanup