Removed commented old filling statements