Removed ugly code that does not seem to be any useful.