Cleaned away warnings