Did some cleanup, removed unnecessary implementation