Removed class, renamed method to original