Considerable cleanup