Cleaned up a lot which is already found in global and default