Removed unnecessary User Controls