Bug fix, removing temp stuff