Cleaned up code warnings; removed unused fields