Removed items causing compiler warnings