removed some excess code