Cleaning up redundant buddypress code