Removed Unneeded code from original fork