Removed unnecessary complications