removed MageObjects (unused)
deleted commented out code