Removed hacky time window code