Some cleanup, redirect still not working