Removed useless stuff (for now)