Removed un-needed interface + item tweaks