Final changes cleaning up removing