Removing fx 4.0 dependent stuff