removed some warnings
Further cleanup