Moved unneeded code from partial