Removed unnecessary interface bloat