cleaned up useless stuff