Removed a bunch of redundant definitions