Code which caused PHP notices is commented out. TODO notice added