Removed obsolete helper methods