Remove GraphicsExtensions, move methods where necessary