no warnings
rm'd a few constants