drastically cut down un-necessary code